Merge remote-tracking branch 'u-boot-samsung/master'

Conflicts:
	boards.cfg

Conflict was trivial between goni maintainer change and
lager_nor removal.

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc boards.cfg
index 24e3a9c158fc9c6e1105433e5d834b805ba29fb0,673e599520005fce7bd4e040df6f2f4fee656569..8e2db8277e73d9f9d16437740d81fb624bf299d7
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -367,8 -376,10 +368,8 @@@ Active  arm         armv7          omap
  Active  arm         armv7          rmobile     atmark-techno   armadillo-800eva    armadillo-800eva                      -                                                                                                                                 Nobuhiro Iwamatsu <[email protected]>
  Active  arm         armv7          rmobile     kmc             kzm9g               kzm9g                                 -                                                                                                                                 Nobuhiro Iwamatsu <[email protected]>:Tetsuyuki Kobayashi <[email protected]>
  Active  arm         armv7          rmobile     renesas         koelsch             koelsch                               -                                                                                                                                 Nobuhiro Iwamatsu <[email protected]>
 -Active  arm         armv7          rmobile     renesas         koelsch             koelsch_nor                           koelsch:NORFLASH                                                                                                                  Nobuhiro Iwamatsu <[email protected]>
  Active  arm         armv7          rmobile     renesas         lager               lager                                 -                                                                                                                                 Nobuhiro Iwamatsu <[email protected]>
- Active  arm         armv7          s5pc1xx     samsung         goni                s5p_goni                              -                                                                                                                                 Przemyslaw Marczak <[email protected]>
 -Active  arm         armv7          rmobile     renesas         lager               lager_nor                             lager:NORFLASH                                                                                                                    Nobuhiro Iwamatsu <[email protected]>
+ Active  arm         armv7          s5pc1xx     samsung         goni                s5p_goni                              -                                                                                                                                 Robert Baldyga <[email protected]>
  Active  arm         armv7          s5pc1xx     samsung         smdkc100            smdkc100                              -                                                                                                                                 Minkyu Kang <[email protected]>
  Active  arm         armv7          socfpga     altera          socfpga             socfpga_cyclone5                      -                                                                                                                                 -
  Active  arm         armv7          sunxi       -               sunxi               Cubietruck                            sun7i:CUBIETRUCK,SPL,SUNXI_GMAC,RGMII                                                                                             -